From: martin rudalics <rudalics@gmx.at>
Date: Tue, 21 Jun 2011 08:51:30 +0000 (+0200)
Subject: Fix last fix of display-buffer-normalize-options.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3391
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f80f7458636496282b3bdf63a18ad98fac9d86df;p=emacs.git

Fix last fix of display-buffer-normalize-options.
---

diff --git a/lisp/window.el b/lisp/window.el
index 605370aa176..4c56d7ffe11 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5437,11 +5437,12 @@ options."
       ;; `pop-up-frames', `display-buffer-reuse-frames', and
       ;; `last-nonminibuffer-frame' set means search for a window shoing
       ;; the same buffer of another frame.
-      (let ((frames (or (last-nonminibuffer-frame)
-			(and (or use-pop-up-frames
-				 display-buffer-reuse-frames)
+      (let ((frames (or (and (or use-pop-up-frames
+				 display-buffer-reuse-frames
+				 (not (last-nonminibuffer-frame)))
 			     ;; All visible or iconfied frames.
-			     0))))
+			     0)
+			(last-nonminibuffer-frame))))
 	(when frames
 	  (setq specifiers
 		(cons (list 'reuse-window 'other 'same frames)